From 8b26dc2cf15f61301974ba0ebd44dcd510ad75d3 Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Thu, 28 Feb 2002 23:46:18 +0000 Subject: [PATCH] Add missing NULL check. * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkfilesel.c | 3 ++- 8 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7548153bc9..a49f94ef4e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2002-02-28 Darin Adler + + * gtk/gtkfilesel.c: (open_new_dir): Add missing NULL check. + 2002-03-01 Tor Lillqvist * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32): Remove diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 99534e19a4..c8c2df3707 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -2948,7 +2948,8 @@ open_new_dir (gchar *dir_name, } sent->entries[n_entries].entry_name = g_filename_to_utf8 (dirent, -1, NULL, NULL, NULL); - if (!g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL)) + if (sent->entries[n_entries].entry_name == NULL + || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL)) { g_warning (_("The filename %s couldn't be converted to UTF-8. Try setting the environment variable G_BROKEN_FILENAMES."), dirent); continue; -- 2.30.2